Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 05:11:36 +0000 (22:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 05:11:36 +0000 (22:11 -0700)
commit191a1a11878302cc9276b1d89e3275d1469a1c63
tree295b172b078184b26f6d659d86edae022343a633
parentf5c541d7e20113434f011420e2175157ba9fdd52
parent3cb1cf3e8dce7f4a72c2f087b9800f2f1ae58495
Merge from trunk.
src/xdisp.c